bitkeeper revision 1.1654 (429f793bJpez_x78azX5iKCsmtPMUQ)

Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk

diff --cc xen/arch/x86/i387.c
Simple merge

diff --cc xen/arch/x86/irq.c
Simple merge

diff --cc xen/arch/x86/smpboot.c
Simple merge

diff --cc xen/arch/x86/vmx_io.c
Simple merge

diff --cc xen/arch/x86/vmx_vmcs.c
Simple merge

diff --cc xen/arch/x86/x86_32/asm-offsets.c
Simple merge

diff --cc xen/arch/x86/x86_32/mm.c
Simple merge

diff --cc xen/arch/x86/x86_32/seg_fixup.c
Simple merge

diff --cc xen/arch/x86/x86_32/traps.c
Simple merge

diff --cc xen/arch/x86/x86_64/asm-offsets.c
Simple merge

diff --cc xen/arch/x86/x86_64/mm.c
Simple merge

diff --cc xen/arch/x86/x86_64/traps.c
Simple merge

diff --cc xen/common/dom0_ops.c
Simple merge

diff --cc xen/common/event_channel.c
Simple merge

diff --cc xen/common/sched_bvt.c
Simple merge

diff --cc xen/common/sched_sedf.c
Simple merge

diff --cc xen/drivers/char/console.c
Simple merge

diff --cc xen/include/asm-x86/shadow.h
Simple merge

diff --cc xen/include/xen/event.h
Simple merge

diff --cc xen/include/xen/sched.h
Simple merge